bitkeeper revision 1.202 (3eb16700-gEpXFlt08DC4GuoWltR6Q)

jws merge

diff --cc .rootkeys
Simple merge

diff --cc xen/common/domain.c
Simple merge

diff --cc xen/common/kernel.c
index 5ee3f2e3cb6178c188d51676c5cf4410fe74b37f,b0a116e63fbf792d29ef69a980db814555b15d79..4d5a2deba05e4509a96fb94c455c2f9d894913fa
--- 1/xen/common/kernel.c
--- 2/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@@ -232,9 -237,12 +237,11 @@@ void init_serial(void
  
  void putchar_serial(unsigned char c)
  {
+ #ifdef CONFIG_OUTPUT_SERIAL
      if ( c == '\n' ) putchar_serial('\r');
 -    if ( (c != '\n') && (c != '\r') && ((c < 32) || (c > 126)) ) return;
      while ( !(inb(SERIAL_BASE+LINE_STATUS)&(1<<5)) ) barrier();
      outb(c, SERIAL_BASE+TX_HOLD);
+ #endif
  }
  
  
@@@ -312,34 -328,38 +327,39 @@@ void cls(void
  /* Put the character C on the screen.  */
  static void putchar (int c)
  {
+ #ifdef CONFIG_OUTPUT_CONSOLE
      static char zeroarr[2*COLUMNS] = { 0 };
- 
 +    if ( (c != '\n') && ((c < 32) || (c > 126)) ) return;
+ #endif
  
      putchar_serial(c);
  
-     if ( c == '\n' )
-     {
-     newline:
-         xpos = 0;
-         ypos++;
-         if (ypos >= LINES)
-         {
-             ypos = LINES-1;
-             memcpy((char*)video, 
-                    (char*)video + 2*COLUMNS, (LINES-1)*2*COLUMNS);
-             memcpy((char*)video + (LINES-1)*2*COLUMNS, 
-                    zeroarr, 2*COLUMNS);
-         }
-         return;
-     }
- 
-     *(video + (xpos + ypos * COLUMNS) * 2) = c & 0xFF;
-     *(video + (xpos + ypos * COLUMNS) * 2 + 1) = ATTRIBUTE;
- 
-     xpos++;
-     if (xpos >= COLUMNS)
+ #ifdef CONFIG_OUTPUT_CONSOLE
+     if(opt_console) {
 -      if (c == '\n' || c == '\r')
++      if (c == '\n')
+       {
+       newline:
+         xpos = 0;
+         ypos++;
+         if (ypos >= LINES)
+           {
+             ypos = LINES-1;
+             memcpy((char*)video, 
+                    (char*)video + 2*COLUMNS, (LINES-1)*2*COLUMNS);
+             memcpy((char*)video + (LINES-1)*2*COLUMNS, 
+                    zeroarr, 2*COLUMNS);
+           }
+         return;
+       }
+       
+       *(video + (xpos + ypos * COLUMNS) * 2) = c & 0xFF;
+       *(video + (xpos + ypos * COLUMNS) * 2 + 1) = ATTRIBUTE;
+       
+       xpos++;
+       if (xpos >= COLUMNS)
          goto newline;
+     }
+ #endif
  }
  
  static inline void __putstr(const char *str)

diff --cc xen/include/hypervisor-ifs/hypervisor-if.h
Simple merge

diff --cc xenolinux-2.4.21-pre4-sparse/arch/xeno/defconfig
Simple merge